4813c2e386413e3615485929d0cf3d53517b8d3e,src/chatty/gui/components/settings/EmoteSettings.java,EmoteSettings,EmoteSettings,#SettingsDialog#,26

Before Change


                d.makeGbc(2, 2, 3, 1, GridBagConstraints.WEST));
        
        main.add(new JLabel("Maximum Height:"),
                d.makeGbc(2, 3, 1, 1, GridBagConstraints.WEST));
        main.add(d.addSimpleLongSetting("emoteMaxHeight", 3, true),
                d.makeGbc(3, 3, 1, 1, GridBagConstraints.WEST));
        main.add(new JLabel("pixels"),

After Change


        main.add(ffzEvent,
                d.makeGbcCloser(2, 2, 3, 1, GridBagConstraints.WEST));
        
        main.add(d.addSimpleBooleanSetting(
                "showAnimatedEmotes",
                "Allow animated emotes",
                "Show animated emotes (currently only BTTV has GIF emotes)"),
                d.makeGbc(2, 3, 3, 1, GridBagConstraints.WEST));
        
        //-----------
        // Emote Size
        //-----------
        main.add(new JLabel("Maximum Height:"),
                d.makeGbc(2, 4, 1, 1, GridBagConstraints.WEST));
        main.add(d.addSimpleLongSetting("emoteMaxHeight", 3, true),
                d.makeGbc(3, 4, 1, 1, GridBagConstraints.WEST));
        main.add(new JLabel("pixels"),
                d.makeGbc(4, 4, 1, 1, GridBagConstraints.WEST));
        
        main.add(new JLabel("Scale:"), d.makeGbc(0, 3, 1, 1, GridBagConstraints.WEST));
        
        final Map<Long, String> scaleDef = new LinkedHashMap<>();
        for (int i=50;i<=200;i += 10) {
            if (i == 10) {
                scaleDef.put((long)i, "Normal");
            } else {
                scaleDef.put((long)i, (i)+"%");
            }
        }
        ComboLongSetting emoteScale = new ComboLongSetting(scaleDef);
        d.addLongSetting("emoteScale", emoteScale);
        main.add(emoteScale, d.makeGbc(1, 3, 1, 1, GridBagConstraints.CENTER));
        
        main.add(new JLabel("Emotes Dialog:"), d.makeGbc(0, 4, 1, 1, GridBagConstraints.WEST));
        
        ComboLongSetting emoteScaleDialog = new ComboLongSetting(scaleDef);
        d.addLongSetting("emoteScaleDialog", emoteScaleDialog);